Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 29 Jan 2010 15:20:05 +0000 (15:20 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 29 Jan 2010 15:20:05 +0000 (15:20 +0000)

Trivial merge